Merge branch 'master' of https://github.com/justbur/emacs-which-key
authorjustbur <justin@burkett.cc>
Fri, 4 Dec 2015 01:51:52 +0000 (20:51 -0500)
committerjustbur <justin@burkett.cc>
Fri, 4 Dec 2015 01:51:52 +0000 (20:51 -0500)

Trivial merge